--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit b49f9e7175eaca42639d7d3aecfcdcd4a2a3f750
Parents : c6c471e
Author : Mark Qvist <mark@unsigned.io>
Date : 2021-09-11T11:33:20+02:00
Added ability to clear conversation history
Changes
2 files changed, 37 insertions(+), 1 deletions(-)
Diff
diff --git a/nomadnet/Conversation.py b/nomadnet/Conversation.py
index e4c423d..a3fcd7a 100644
--- a/nomadnet/Conversation.py
+++ b/nomadnet/Conversation.py
@@ -180,6 +180,15 @@ class Conversation:
for purged_message in purged_messages:
self.messages.remove(purged_message)
+ def clear_history(self):
+ purged_messages = []
+ for conversation_message in self.messages:
+ purged_messages.append(conversation_message)
+ conversation_message.purge()
+
+ for purged_message in purged_messages:
+ self.messages.remove(purged_message)
+
def register_changed_callback(self, callback):
self.__changed_callback = callback
diff --git a/nomadnet/ui/textui/Conversations.py b/nomadnet/ui/textui/Conversations.py
index be01b31..d7b1493 100644
--- a/nomadnet/ui/textui/Conversations.py
+++ b/nomadnet/ui/textui/Conversations.py
@@ -20,7 +20,7 @@ class ConversationDisplayShortcuts():
def __init__(self, app):
self.app = app
- self.widget = urwid.AttrMap(urwid.Text("[C-d] Send [C-k] Clear [C-w] Close [C-t] Editor Type [C-p] Purge"), "shortcutbar")
+ self.widget = urwid.AttrMap(urwid.Text("[C-d] Send [C-k] Clear Editor [C-w] Close [C-t] Editor Type [C-p] Purge [C-x] Clear History"), "shortcutbar")
class ConversationsArea(urwid.LineBox):
def keypress(self, size, key):
@@ -578,6 +578,31 @@ class ConversationWidget(urwid.WidgetWrap):
urwid.WidgetWrap.__init__(self, self.display_widget)
+ def clear_history_dialog(self):
+ def dismiss_dialog(sender):
+ self.dialog_open = False
+ self.conversation_changed(None)
+
+ def confirmed(sender):
+ self.dialog_open = False
+ self.conversation.clear_history()
+ self.conversation_changed(None)
+
+
+ dialog = DialogLineBox(
+ urwid.Pile([
+ urwid.Text("Clear conversation history\n", align="center"),
+ urwid.Columns([("weight", 0.45, urwid.Button("Yes", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("No", on_press=dismiss_dialog))])
+ ]), title="?"
+ )
+ dialog.delegate = self
+ bottom = self.messagelist
+
+ overlay = urwid.Overlay(dialog, bottom, align="center", width=34, valign="middle", height="pack", left=2, right=2)
+
+ self.frame.contents["body"] = (overlay, self.frame.options())
+ self.frame.set_focus("body")
+
def toggle_editor(self):
if self.full_editor_active:
self.frame.contents["footer"] = (self.minimal_editor, None)
@@ -618,6 +643,8 @@ class ConversationWidget(urwid.WidgetWrap):
self.conversation_changed(None)
elif key == "ctrl t":
self.toggle_editor()
+ elif key == "ctrl x":
+ self.clear_history_dialog()
else:
return super(ConversationWidget, self).keypress(size, key)
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────